finished base ex31
finished refactoring ex31
fixed typo
added ex32