Removed items that were done
Fixed headers