fixed stuff to a point
Merge pull request #102 from red-admirals-2014/fixing_more_stuff

fixed stuff to a point