Added comments, got rid of custom extensions.