all around fixes