focus mode + bug fixes

Added in focus mode + generic bug squashingz