Fixed lotsa bugs before release