Bug Fix and added contactinfo