small tweaks to base-time:
* added work around for clashing local-vars..I'm not done with this its
  just a hack