cleaned up naive whiles, added shebang