SMS working now + cleanups