folder test done and cleaned up some code