Merge pull request #52 from jamkcas/working

uncommented a div to restor functionality
fixed bugs