big update, lots of bugs