Added more TODO markers
Fixed visibility on variables, various minor fixes, NOTE: BUTTONWIDGET IS BROKEN