fixing a few issues
allowing weaponskills without being engaged