Fixed some Pull Issues and Started on Crash Handeling