last little bit of fixes