More bugg finding and fixing