cleanup: removed sLayer
javadoc: prepared for merge