general cleanup
big update