More tweaking and changes