some small changes ... :D