small fixes here and there... :)