closes #33 and dealine messages
closes #29 and error with #40 allways showing