tweaks
tweaks
fixes merge conflict
adds basic about modal