fixes to problems we discussed :P