Perfecting some things here and there

Soft-coding some parts to make it soft as an android in the future.