Bugs galore

Self. bugs + others