Fixed execution, added more stats, needs more work on optimization