added a few fixes to prevent segfaults, removed most message updates