Some bug fixes and add puma status task