Thanks TBN54 and mojobmw_e90,
I replaced my spark plugs today and the car runs like a dream. Smoke has lessened in the last week or so but is still around now and then. Also found out that my engine cover is missing a bolt, and the lower cowl is not held in by anything other than its placement in the engine bay and the cable it secures... Oh well, Duct Tape is holding the cowl tight in place until I get some bolts.