Finished data types, fixed some minor errors from before.