cleaning up
fixing issues