Misc Small Issues Fixed, Some Renaming for Clarity, Block Controls Added