more debugging and changes

think the issue might partially be with ifs/else ifs. More testing will
be completed to check on this