last bugfixes, new and hopefully final build