Fixed #34. Fixed #35. Fixed #32.