Some aesthetic updates... Not tested on cluster