Addressing various issues including #6