Stylechanges and some fixes!