nightly20130830
fixed a lot of things