Code improvements and some extra properties