Fixed mah bugs @CaptainShadows :P fixes #17 and #9