Make profiles usuable
and cleanup here and there