temporate base() haack and some simple fixes