Small additions and lots of documentation