cleaned up a few things here and there - version 1.1