Fix several previous derpiness

fixed #8