Some changes - and fixes ;)