Added some stuff to the bugfix. Not finalized yet.

Signed-off-by: shrimpboyho <shrimpboyhoftw@gmail.com>