Made changes to core structure; added comments.