debugging
error handler
errors
minor layout tweak