fixed format, added some resources