Fixed includes, updated copyright