Added wallpaper code + some fixes