More idea stuff and simple optimizations