misc fixes and code cleanup
	signed off by: jaysurp031@gmail.com