more rushed fixes