bugfix #2 and some imporve