Error Handler & Moved other handlers
Fixed fullscreen (merge)

Were conflicts