all issues - final bug fixing by Michael Spitzer