Added functionality
fixed minor bugs