improvements, slots still not working