Changed some stuff and tested some features