unified errors & removed old debugs

Signed-off-by: Quintus <devqqq@gmail.com>