cleaning up
fixes + latest changes