Syncing with local, was about time :)

Some minor changes :)