v7.0r1.2a

Fixed several simple bugs