Add hiccups and fix some errors