fixed semicolons; merged files