bug fixes / phone link / serveral states