Jobe time to do some real testing

+A/+U and a few code clean up