More updates & tweaks