added fps counter / cleaned up a bit more