issues and some ability improvements