clean up

testing
fixing issues