ready for testing
code cleanup
add missing file, fix bug in email
tested most functionality; haven't tested journals or messages