Removed typos, small bugfixes