some bug fixes

let's work with this