fixing some return and logic berkas
Merge branch 'mywork' of https://github.com/dycodedev/simaya into mywork