*Fixed finite toggle & other various bugs