added a few more fixes