some small changes :)