lots of changes, yum yum

here we go..