Fixed all base method calls and added comments.