Objects name for corresponding classes should be used for correct layer switching.
Small bug fixes.