minor bug fixes :)