Fixed bug, added missed files