Added callbacks
Aesthetic improvements