Final changes

Exceptions removed, improts fixed