top.v:
- More fixes for small errors found in synthesis