Some script fixes and includes working