Various changes and some added tiles