Implement #550
Improve javadocs wrt #555
Fix #496
Fix for #511