Last bugfixes. Comments needed.