Fixed broken stuff, when I hurried the upload.