more fixes

i'll be back on saz' track soon :)