Clean up init. Added package management