multiple fixes, new features