bugfixes, even more * and & removed.