fix imports + add comments resources