Did some testing, all should be working now