Useless features removed, new ones added, bugfixes