some minor changes :)