more awesome changes

so many !!!