Cleaned up
Fixed a bug where points and task was not calculated correctly
Added support to also update status.