Some minor work as of 21-3-13