Updated to parse manual input. Updated package files and dependencies.