small fixes and figureouts