Updates some version references
Refactored some block code