Polish and bugfix