Fixed basic bugs and removed solar fitting