Fancied up some more + organized and a few updates