clean up
skeleton, fixes