cleaned some stuff up, fixed #8