Stage

Many little fixes