WIP additional bug fixes

Refactor bug/feature detects as it has become quite a long list