@mapk fixed alignment issues cleaned up code and also fixed issues #1 #2 #3 #4 #5