Fixed up a lot, also version 1.0.1