Flesh out error module; readibility improvements; adding/removing handlers.