Few more changes

This are the most recent changes!