some fixes | add better errors