More tweeks to the code base