Clytwynec/rake2paver quality take2