Fixed some bugs, trying to tender skeleton.