Fixed various income issues