Fixed a couple bugs, and switched header back to .h