fixed some simple issues