Working on merging the versions, small fixes here and there.