front and dev, many fixes