some bug fixes i guess