various functional and visual fixes