some misc stuff added