Minor changes, added some local files