fixed more smaller things