Error messages, menu width fix, clean up