Fixed several issues.  Looks like its working.