some fixes

hot testing