Updating to latest (3.3) modules etc. and some formatting tidying.