removed demo, fixed some files problems