Port fix, task fix, improvements