fixed labels not updating correctly
+ cleanup