Fix/improve some classes