updates

clean up parts of the code:-
  remove unneeded echos
  use case instead of if at certain points
add support for badly written manifests