added TODO and simplified fitToScreen