Minor code base changes and other added options