Some improvements and stuff