Major update

A lot of additions and improvements