reverted to unit height sin floor, for consistency
minor changes to weights