fixed first two issues in issue #467
fixed first two issues in issue #467

jonfroehlich/makeabilitylabwebsite,jonfroehlich/makeabilitylabwebsite,jonfroehlich/makeabilitylabwebsite,jonfroehlich/makeabilitylabwebsite,jonfroehlich/makeabilitylabwebsite,jonfroehlich/makeabilitylabwebsite