Added default stuff
Fixed wrong if-statements