cleanup
started implementing weapons