Merged all the stuff I did the last few days

Feel free to make it fit to your needs. I didn't change """ to <<< yet (I still don't like <<<) ;)