fixed error, other minor changes