Fix small bugs and add more messages