added some fixes to integrate into 4.3. should be back to working condition now