Fix offsets, implement some of @tterrag1098's changes