Resolved issue with missing dependency and some minor tweaks