some fixes i pushed into master