Some updates and tweaks