fixed some aspects