Proper Hidden and bugfixes.