Added storage.type support, fixed function calls and keyword ops