Added several twigs and bug fixes