bugfix and features enhance