silluth working + fixed stuff