Fixes

Timeout so no infinite recursion and webpage fix