fixed, added, modified stuff