Just a bit of work, fixing bugs

Signed-off-by: NullAmbitions <NullAmbitions@gmail.com>