clean up misc problems
fix tests
clean up folder