adding stuff, mostly made by Theo V