merged lexoyo fork, cleanup and fixes