updating for 1.0 and general cleanup