Fixes and functionality updates