fixing and twitting
some more tweeks