fixes #12 and added health