Changed a few things; please ignore