final pre beta fixes done