Big update, fixed lots of comments