tasks added, minor cleanup