Should really write unit tests... hmmm unit tests..
minor changes