Clean up, add few commands, add config and custom messages