FS-15 FS-16 FS-25 added javadoc and checks