More fixes tried and guihandler updated