Finishing (almost hihi hopefully) details
Fixed bugs found by Chan chan