No moar ; cleaned errors