Fixed some array alignment, less nans now. WIP