Style changes and small bugfixes