Added statuses

+ fixed a few bugs