Some final changes
easy fix