fixes, stolen switch added