improvements + added a new assignment (not tutorial)