v1.0 - fixes and things