1.2

fixed a few things