Improvment and Bugfix