Some improvements

Based on the TODO. Expect more soon!