fixed and tweaked... i b done now