fixed bugs: main skeleton is working