improvements and fixes found on first skeleton usage