fixed a bunch of bugs
Updated info