Added ALU logic and remove error/warnings