fixed lots of bugs, added instructions