tweaked some things, all working