Added/fixed lots of things