Alot of changes made!

Signed-off-by: perakerosenlund <Enigma1676@gmail.com>