Fixing up smoke and things for better performance!