Better email, bug fixes, added extended changes