Bug fixes and Skeleton added