fixing some simple issues