more bug fixes!