[#28] Some More Fixes

Made recommended changes.