Fixed more issues from the TODO list, tag will contain complete changelog