Adam: Minor code updates, very little functionality added