core file completed with minor changes to other files