minor fixes.. all working..