Fix some message errors, add some debug stuff