Fixed error
Fixed another error
Added lots