Master - fixed some more bugs