A few updates & tweaks