reorganized
changed references
formatting
login activatored moed