added/fixed some things