Add some more hooks & fix stuff