Changed a bunnch of stuff - documented in README