Various changes. Sorry for these terrible messages