updates, rock class modified, pendind solve bug fixes