Better catalog
Fixed minor bugs