change order of file inclusion
better comments