cleaned up joris his bugs