Incremental update

Updated declarations and comments.  Removed duplicate dec statements.