small fixes
clean up code
ready
only send messages to emails
comments