Lots of stuff added/fixed