Fix some bugs, be more polite