removed beta warning
removed unused functionality
better error handling