Bunch of little additions/fixes