Minor bugfixes, fixed scaling issue, improvements to lighting