007.02 Added spindle (stubbed); fixing errors and warnings