fixed few things that broke with the last fix