Some final tweaks and modifications