Improvements, todo list gone through and meaningless or easy ones done