Docu weapon finished, manner finished and renamed some functions for
better readability