fixed some zipping exceptions added other exception handling, split some stuff out