critical frontend fixes, removed some divitius flaws