fixes, features