Adding a few extra things and acomodating for a few more tweaks.