switch enhancement, bug fixes

slowly but surely do bug fixes come
period update