Fixed errors, streamlined
Commented out bizarre error trigger