Pyssy updated and cleaned up