Fixed odd regressions in code. Definitely was working before merging between desktop and laptop