Fixes, error handling, improvements..