improvements here and there
improve frontend