1.0-17

Minor changes and facial things