Small improvements.
Small improvements and debugs.