Tyler Bindon (martica) - bug fixes
