Update category with code from other branches
Update comment blocks