final changes, fixed bugs from email feedback