1.3.1 update

Changes for the UUID stuff and some code reworks (actually, lots of code
reworks)