bugfixes, added files, extra features