added updates and a few tweaks