Cleaned up pockets/paths and general path generation