Fixed most boogs. Freezing code for now.