turn off debug, and some little tweaks