Fixed some bugs. Add hard test =(. Add apk