address master bugs fixed