Spherical and non-spherical gravitational collapse