Fixes, added messages list.