some fixes =)