Added all things mentioned in previous commit.