Kracoeus 7718

this PR fixes several bugs and an improper import statement.