Added some basic reflection and a few fixes