Ok cleaned up some bugs.. getting off now..