Sblargaba edits to keep only changes to vhdl