fixed several additional items and bugs