Updating with latest changes
Fixing stuff