meeps
removing some syntax problems -.-
adding missed check
fixed conflicts