Commiting v1 with minor lint bug fixes