have to test this with external monitor
starting to fix the mess I have been neglecting
fixes Issue #2