Changed quite a lot of stuff.

Signed-off-by: Kwpolska <kwpolska@gmail.com>