Fixed formatting, linking bugs