fixed some consistancy issues; added more details