fixed bug with shooting weapons
improved previous bugfix
updated TODOs