Fixed a few elseifs