fixed some formatting, gl merging