just some code change
add FIXME :')
standardized const convention
restore some casual delete