A few changes, getting rid of **most** errors

Errors after hitting send now