reserved more keywords and fixed warnings