several changes and tiles add