Bug fixes, and initial Jumpstart support complete (need to add alternate package support)