added init-packages + other minor changes