#4 - Fixed red tests
#4 - Performance updated and housekeeping