v1.0 - fix things