Even more bugfixes and polished app