fixed several smaller issues