Some fixes and updates..