Added custom messages and solved some basic bugs.