...fixed more stuffe