Version 3.0.1

Fix spacing on phones
Added some TODOs